[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ca9cb3b4da -s ours am: 372d63f821 -s ours am: c2bcdbe462 -s ours am: 98c5119851 -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2819ca271f48440b602d3d6dfd486f4f07114db6